]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
keyboard: Shuffle text direction initialization
authorCarlos Garnacho <carlosg@gnome.org>
Thu, 30 Jun 2022 09:41:12 +0000 (11:41 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Wed, 10 Aug 2022 17:11:26 +0000 (17:11 +0000)
We do set the full OSK as LTR since keymaps are defined in that
direction. Other actors inside the OSK might want differently so
move this piece of setup to init(), so child actors can set their
own without the OSK overwriting the value.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2278>

js/ui/keyboard.js

index d63468768da67828aaa6910f522cf7c984dffbbf..25ffa67fd55ca97e1977251652f6d2d09d3f5597 100644 (file)
@@ -1285,7 +1285,15 @@ var Keyboard = GObject.registerClass({
     },
 }, class Keyboard extends St.BoxLayout {
     _init() {
-        super._init({ name: 'keyboard', reactive: true, vertical: true });
+        super._init({
+            name: 'keyboard',
+            reactive: true,
+            // Keyboard models are defined in LTR, we must override
+            // the locale setting in order to avoid flipping the
+            // keyboard on RTL locales.
+            text_direction: Clutter.TextDirection.LTR,
+            vertical: true,
+        });
         this._focusInExtendedKeys = false;
         this._emojiActive = false;
 
@@ -1410,11 +1418,6 @@ var Keyboard = GObject.registerClass({
         this._ensureKeysForGroup(this._keyboardController.getCurrentGroup());
         this._setActiveLayer(0);
 
-        // Keyboard models are defined in LTR, we must override
-        // the locale setting in order to avoid flipping the
-        // keyboard on RTL locales.
-        this.text_direction = Clutter.TextDirection.LTR;
-
         Main.inputMethod.connect(
             'terminal-mode-changed', this._onTerminalModeChanged.bind(this));